* x-win.el (x-defined-colors): Use x-color-defined-p instead of

	x-defined-color.
	(x-handle-geometry): Use x-parse-geometry instead of x-geometry.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index a088a265b29defa5836b9a4f069d0dbd0d355860..2e518476294f715656cee68e7079ae5f6bebcfdf 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -147,8 +147,9 @@
 
 ;; Handle the geometry option
 (defun x-handle-geometry (switch)
-  (setq initial-frame-alist (append initial-frame-alist
-                                    (x-geometry (car x-invocation-args)))
+  (setq initial-frame-alist
+       (append initial-frame-alist
+               (x-parse-geometry (car x-invocation-args)))
        x-invocation-args (cdr x-invocation-args)))
 
 (defvar x-display-name nil
@@ -418,7 +419,7 @@ This returns ARGS with the arguments that have been processed removed."
     (while all-colors
       (setq this-color (car all-colors)
            all-colors (cdr all-colors))
-      (and (x-defined-color this-color)
+      (and (x-color-defined-p this-color)
           (setq defined-colors (cons this-color defined-colors))))
     defined-colors))
 \f